Mark ab/7061308 as merged in stage. Bug: 180401296 Merged-In: I92c2d0d9ba62a77057ef9a0006400361fa876358 Change-Id: I618ad63befe6b0de61773aca4e78f95c1f7f4a31